fix: address post-merge review findings (#876, #900, #875)#963

bradygaster merged 5 commits into

devbradygaster/squad:devfrom

squad/942-rebase-type-safetybradygaster/squad:squad/942-rebase-type-safetyCopy head branch name to clipboard