Preparations for #24lm continue