Merge remote branch 'origin/xseg' into demo