Fixing a few sync issues.
Merge branch 'test' into dev