refs #709, added support to disable auto_sync