a2-ctrac-cindy-trac#103

cindytrac wants to merge 2 commits intocs4241-22a:maincs4241-22a/a2-shortstack:mainfrom

cindytrac:glitchcindytrac/a2-shortstack:glitchCopy head branch name to clipboard