Merge "Remove then add during replace to reset vis" into rvc-dev