Can this be moved to ON_QA?
@sbose Only if we are considering the issue with the confusing CLI mapping as a separate issue - which I think we shouldn't as it was inroduced by the fix to this issue. The fix for the new issue is already merged on main, but not backported to v2.0. We are still waiting for a couple more fixes before we backport and create a new build