This patch prepares us to move these elements around in the tree.
Attach a file by drag & drop or click to upload
