Merge branch 'fix_missing_toolchain_defaults' into 'master'

Add missing default args for if toolchain can't be found

See merge request !307