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