PRSDK-4807 Addressing review comments