[ALOY-1116] updated optimized sync adapter code
updated to merge with master
Merge pull request #564 from skypanther/ALOY-1116b

[ALOY-1116] updated optimized sync adapter code