merge in master-release history after reset to 04348c3637253956109a0e75b4d61713c2830390