merge in master-release history after reset to 61ddac28de56861aa77a7f06e5607ddec7ce8ccd