Merge Aranclano's autoshuttle call (and fix the AI.stat||AI.client bug)