[ALOY-1144] 1_5_X version of PR #567
Merge pull request #568 from skypanther/ALOY-1144b

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