Preparations for #51