(ABM-565)
Merge branch 'gsc' into develop