The work is already done as part of #574 ; just need to push it to a branch.
The work is already done as part of #574 ; just need to push it to a branch.