[ALOY-967] merge changes done on ALOY-956

[ALOY-967] merge master