PRD-1488 fixed

pull request with correct commits