fixing missing custodian
Merge branch 'dev' into ivan