Merge "Update tag and PH config"