Merge "Use pending.xml to persist sync ops." into klp-dev