Arkestra refactor compatibility - merge