Merge branch 'master' into obj-array-revamp