Merge "Fix issue #6284404: ArrayIndexOutOfBoundsException in..." into jb-dev