merge in master-release history after reset to 250d15b46348ca74a280b5554d369de99242ded6