Merge branch 'xgene-fixes'