merge in master-release history after reset to 66750e63954ca00341a5187ebd6497b4e49b0faa