Update changelog 12.master