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