Merge xgen and soft deprecate existing behaviours