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