[sr-dev] git:master: Merge commit 'origin/andrei/to_parser_fix'