Fixed ABM-243
Merge branch 'bug-243' into develop