Backport of #4557.  Improve offline validation for53 x