Merge "Repopulate cache with sibling visibility on remove" into rvc-dev