SOAP-653: Removed duplicate code and fixed compilation errors
Merge branch 'next' into save-dialog-SOAP-653
Merge branch 'save-dialog-SOAP-653' into ready-for-testing