delos3geur: Updates from 10.1 branch