Merge "Prevent OOB read in i93 tag detection" into qt-qpr1-dev