TODO minor updates
Merge branch 'master' into sla-determination