Merge "Proper fix for the LRU IndexOutOfBoundsException" into qt-qpr1-dev