sync with the orion git tree