Closes #5388

Reassign #5388 to @tpritchard