merge in master-release history after reset to 5c39bb4f5e6c1646497a900e5104d38e5b3d16de