* commit 'b4652172404643d0a8fffbcc315cddcc733ec5ba': Fix issue #6284404: ArrayIndexOutOfBoundsException in...