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

* commit 'dfafaffe8601a3483e8da8f32bd4c754fecb88c1':
  Fix issue #10387684: ArrayIndexOutOfBoundsException in ArrayMap.put