[v6r12] Dealing with extra options from the pilot