(ABM-199) reverted thread safe change
Merge branch 'build' into develop