Merge from xpansa