Merge "Add setting to control the creation of NullRevision on upload"