IPF-72: COMPLETE
Merge branch 'feature/IPF-72' into develop