Merge "Add pti-o2-settings"