Clean up build canonical warnings#6880

DOsinga merged 3 commits into

mainaaif-goose/goose:mainfrom

split-build-canonical-modelsaaif-goose/goose:split-build-canonical-modelsCopy head branch name to clipboard