Build fix for non-unity builds
Merge branch 'master' into feature/Increased-logging-for-components-or-objects-7394