Null merge for ddb406904be1 backport.