Merge REXOS into ESCIMO