Merge commit '85d650c89998eb108faa2c02dcc32467e23f9555' * commit '85d650c89998eb108faa2c02dcc32467e23f9555': Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
Merge commit '85d650c89998eb108faa2c02dcc32467e23f9555' * commit '85d650c89998eb108faa2c02dcc32467e23f9555': Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that