Merge "Remove @IgnoreUpTo(Q) annotation and isAtLeastR() check" into main