Merge branch 'ramv/x-array-delegation' into charm