- Fix trunk installation breakage introduced in 46570