changelog for 812c8158765f5c0952a79b448db7f61caaf107a1
merge 656399c96ec0614d692d3d307e0d8ab6a7676307