merge in master-release history after reset to babde55bf843c2262d84580c0139ed6b040bef7e