New feature and copy removal
Merge branch 'feature/EXP-420' into develop