Merge pull request #10 TASK 13239 with fixes