Merge "Update PH config"