Merge code fix for replication non-block test failing instead of skipping on