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