am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in...
am dfafaffe: Merge "Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev
* commit 'dfafaffe':
Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put