merge in master-release history after reset to 116bf16d1f822c264573662031ed9be4ba49a9da