merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89