Merge "Remove ignoreUpTo Q statements" into main