Miscellaneous Alignment/OfflineValidation
improvements
#35983
Merged
Alignment/OfflineValidation
improvements
#35983