merge in master-release history after reset to 236e67ce79d04634061658c1f57610723d4a0001