Merge "Fix overriding pending ProcessChangeItems" into rvc-dev