Sync Folsom HA with Master