merge r20675