Hotfix 1.6.6

This will fix warehouse CI and addresses some comments that I got from David and Paul related to task 9378.