[#74774412] Initial merge-based compile errors.