Merge "Fix issue #28403313: Improve package manager query commands" into nyc-dev