Merge "Disable restricted bucket." into rvc-dev