With the Merlin rework in 3.5 — it's not really a rework, they're just doing some stuff to the cockpit, right?

Yeah, we're not planning on giving it a full rework like other ships. It's more just bringing the cockpit into line with all the modern templates, the animation templates, and the screen visibility. It does have a custom UI setup on it at the moment. I expect that to stay the same, but the amount of screen real estate the screens take up will be adjusted to meet the minimum standards.