(ABM-208) corrected stopABM if check.
Merge branch 'working' into develop