jira/PJSM-248

Please review...