Merge remote-tracking branch 'remotes/bsdimp/tags/bsd-user-arm-2022q1-pull-request...