Initial commit of #2821 (https://labs.riseup.net/code/issues/2821)
Updating to reflect the current patch level