Generic autopilot (testing do not merge)

Just want to clean up any TC problems before real pull.