separate queue from
 ref 14085
Merge remote-tracking branch 'origin/bug/14085_separate_sync_queue'