Merge branch 'ramv/exorcise-arrayindex-bug' into charm