Merge branch 'orion/cleanup' into orion/dt