[sr-dev] git:master:0a67119d: check corner-case and add comments