fix: hi1.4xlarge should expect 16 (v)cpus
Merge remote branch 'origin/threaded' into threaded