Merge branch 'ab/unused-annotation' into maint-2.38