Merge "Add latest SO configuration changes"