Merge from 4.1.6 for trq-1528: invalid read when array slot failed.