Merge pull request #1557 from rpv-tomsk/master