IPF-57: COMPLETED
Merge branch 'feature/IPF-57' into develop