Merge branch 'Array2D-wrapping-release' into release

Change-Id: I24c541a60d5a15f1b1332cf4369aa03d6be34261
Merge branch 'release'

Change-Id: Id1be0c29949e92a7a7b50795a9fbffdc2e6fb193