No functional changes, not prep for anything, just keeping up some momentum. Closes: #1344 Approved by: jlebon