merge in master-release history after reset to c6b8225e759d1790d9a38082a18ce7e24a3dba27