Merge "Add master switch to enable/disable RESTRICTED bucket." into rvc-dev