issue #19290: using new passport structure