PDM-3 Merged pull request from Daniil Ivanov