11877

Closes #11877.

(Let tests run before merge, please.)