minimal changes which fixed PRSDK-4786