Adopt latest Orion changes