[ALOY-1116] optimize sync adapter, per pull 518
Merge pull request #556 from skypanther/ALOY-1116

[ALOY-1116] optimize sync adapter, per pull 518