Merge "Enable RESTRICTED bucket." into sc-dev