Merge changes to xovis into new PR that will replace PR 126