Merge branch 'x3'