Merge "Avoid races on null revision insertion"