Merge pull request #9301 from keymanapp/fix/developer/9296-9297-9298-9299-9300-compiler-warning-tweaks fix(developer): kmc warnings tidyup 🗜