merge in master-release history after reset to 6f2b61441854c1a1d10ea7c7e8ef14f7403a46dc