Pull changes over from DSH105/Commodus@9d2e7dd into existing dependency utilities