Merge branch 'xseg-refactor' into debian