Update to Companion 2.16ai2zx1