Merge pull request #11190 from mathiasvr/pr-arraylen