Merge branch 'orion-fixes2'