[ALOY-1144] implement PR570 in master branch
Merge pull request #571 from skypanther/ALOY-1144c

[ALOY-1144] implement PR570 in master branch