[ALOY-967] merge master