Hi RG,

please, if possible, don't move blocks.  It complicates merging between our many
git branches for no good reason and it makes review harder.