(#1639) - Properly queue calls to replicate and sync