Projectkk2glider/remaining issues 1311

Consider this changes in relation to issue #1311
Nope, but for Taranis previous behaviour of Companion was clearly wrong.