Merge pull request #6232 from piotr-semenov:semenovp_fixes