merge fixes for ALOY-635
changelog update for 1.1.2