Merge pull request #5660 from ronald-cron-arm/restore-full-compat-testing-2.28

Backport 2.28: Restore full compat testing