[ALOY-1048] backport fix to 1_4_X
Merge pull request #455 from skypanther/ALOY-1048b

[ALOY-1048] backport fix to 1_4_X