[ALOY-1144] 1_5_X version of PR #567