[#865709] Moved a few final things around.