Merge branch '868-unused-functions' into 'main'

Resolve "Unused functions and related Makefile warning settings"

See merge request !1169