Merge "update opt config variables for SO"