fixed based on review comments (PRSDK-3197)