Backport of #4557. Improve offline validation for70 x