merge in master-release history after reset to 87b6b24f863e952bec9be7a5cb8415c195744b18