Quite a few changes, as it seems like previous wrapping was done manually, so it's all over the place. As noted in #28424 Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> Upstream-commit: 87b3ad76c9 Component: cli
87b3ad76c9