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