This is a preliminary commit, without any functional change, just to make the next one easier to review.
Attach a file by drag & drop or click to upload
