Merge branch 'apm_xgene'