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