merge r20669