Merge "rename index for OSS, disable forcing by default"