Merge branch 'cc/fix-missing-va-end-in-revert' into maint