[155] Deleted comment
Merge branch 'feature-155' into develop