(also some minor adjustments to command output for convenience) (cherry picked from commit 51e28ae76a40bb40bdd6f163773d2e3bd8f76ec4)
(also some minor adjustments to command output for convenience) (cherry picked from commit 51e28ae76a40bb40bdd6f163773d2e3bd8f76ec4)