sync-optimizations interim version 01 from Xian