Misc. WA migrations and macro fixes
What does this MR do and why?
Misc fixes that I've found due to wrong macros or missing macro defines
Includes !24992 (closed)
Misc fixes that I've found due to wrong macros or missing macro defines
Includes !24992 (closed)