merge in master-release history after reset to de546168fce332cd5e825cb1ae0fa4197015d5ea