[Stagging] Aurora tweaks 2#1713

tdavidcl wants to merge 28 commits intoShamrock-code:mainShamrock-code/Shamrock:mainfrom

tdavidcl:aurora-test4tdavidcl/Shamrock:aurora-test4Copy head branch name to clipboard