Merged another fix for sync.
Merge branch 'test' into dev