Restructure code a bit to prepare it for the next patch. Plain code movement. /reviewed-on !5
Attach a file by drag & drop or click to upload