Merge "Ensure tests work with restrited bucket toggling." into rvc-dev