PASDK-258:Update code merged from 4573453 (PP PASDK-242) for default build.