merge in master-release history after reset to 5ec92ecce90706c0409327e67b910f11e92b75d4