merge in master-release history after reset to e14b37eb07b394fef05da5ee09dc6d33e3a25711