merge in master-release history after reset to e9001a4d533cba6ee45063c8d83738694a5013ec