Xnum improvements.
Merge branch 'develop' into feature/CentralPublishing