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