ack 2.12

Closes #25176.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>