Merge branch 'ar/lpar'