(#2018) - fix create-remove-replicate-create-remove-replicate