merge in master-release history after reset to 202633d0aa99de903f57c8372cc72b7349ba38e4