Merge "Correcting Offset and size checks while queing" into main