@Idolf I still can't get the old version to work, but this should at least put things back the way they were before 66e41bd and account for new changes
LGTM. I will do a backport to beta and perhaps stable once you merge it.
Retargeted to beta to ease backports. Doesn't need to go to stable.
Fix bash completion regression
This is failing on the Github checks. #761 needs to be backported first.
Merge branch 'beta' into bash-completion-fix