chore: merge v3 into v4#121

hpidcock merged 3 commits intojuju:masterjuju/cmd:masterfrom

kian99:merge-v3-to-masterkian99/cmd:merge-v3-to-masterCopy head branch name to clipboard