Merge branch 'basop-1471-compilation-fix-for-wmc-tool-broke-stack-memory-calculation' into 'main'
Resolve "Compilation fix for WMC tool broke stack memory calculation" See merge request !2647
Resolve "Compilation fix for WMC tool broke stack memory calculation" See merge request !2647