SQLSTATE[HY000]: General error: 1116 Too many tables; MySQL can only use 61 tables in a join:

(appears to be same as this solved bug? https://expressionengine.com/support/bugs/23649/searching-content-in-the-control-panel)

Just upgraded 5.4 to 6.0 and getting this when trying to load site index:

SQLSTATE[HY000]: General error: 1116 Too many tables; MySQL can only use 61 tables in a join: SELECT t.entry_id, t.channel_id, t.forum_topic_id, t.author_id, t.ip_address, t.title, t.url_title, t.status, t.view_count_one, t.view_count_two, t.view_count_three, t.view_count_four, t.allow_comments, t.comment_expiration_date, t.sticky, t.entry_date, t.year, t.month, t.day, t.edit_date, t.expiration_date, t.recent_comment_date, t.comment_total, t.site_id as entry_site_id, w.channel_title, w.channel_name, w.channel_url, w.comment_url, w.comment_moderate, w.channel_html_formatting, w.channel_allow_img_urls, w.channel_auto_link_urls, w.comment_system_enabled, m.username, m.email, m.screen_name, m.signature, m.sig_img_filename, m.sig_img_width, m.sig_img_height, m.avatar_filename, m.avatar_width, m.avatar_height, m.photo_filename, m.photo_width, m.photo_height, m.role_id, m.member_id, wd.*, md.* , exp_member_data_field_1.*, exp_member_data_field_2.*, exp_member_data_field_3.*, exp_member_data_field_4.*, exp_member_data_field_5.*, exp_member_data_field_6.*, exp_member_data_field_8.*, exp_channel_data_field_9.field_id_9, exp_channel_data_field_9.field_ft_9, exp_channel_data_field_10.field_id_10, exp_channel_data_field_10.field_ft_10, exp_channel_data_field_11.field_id_11, exp_channel_data_field_11.field_ft_11, exp_channel_data_field_12.field_id_12, exp_channel_data_field_12.field_ft_12, exp_channel_data_field_13.field_id_13, exp_channel_data_field_13.field_ft_13, exp_channel_data_field_14.field_id_14, exp_channel_data_field_14.field_ft_14, exp_channel_data_field_15.field_id_15, exp_channel_data_field_15.field_ft_15, exp_channel_data_field_16.field_id_16, exp_channel_data_field_16.field_ft_16, exp_channel_data_field_17.field_id_17, exp_channel_data_field_17.field_ft_17, exp_channel_data_field_18.field_id_18, exp_channel_data_field_18.field_ft_18, exp_channel_data_field_19.field_id_19, exp_channel_data_field_19.field_ft_19, exp_channel_data_field_20.field_id_20, exp_channel_data_field_20.field_ft_20, exp_channel_data_field_21.field_id_21, exp_channel_data_field_21.field_ft_21, exp_channel_data_field_22.field_id_22, exp_channel_data_field_22.field_ft_22, exp_channel_data_field_23.field_id_23, exp_channel_data_field_23.field_ft_23, exp_channel_data_field_24.field_id_24, exp_channel_data_field_24.field_ft_24, exp_channel_data_field_25.field_id_25, exp_channel_data_field_25.field_ft_25, exp_channel_data_field_26.field_id_26, exp_channel_data_field_26.field_ft_26, exp_channel_data_field_27.field_id_27, exp_channel_data_field_27.field_ft_27, exp_channel_data_field_28.field_id_28, exp_channel_data_field_28.field_ft_28, exp_channel_data_field_29.field_id_29, exp_channel_data_field_29.field_ft_29, exp_channel_data_field_30.field_id_30, exp_channel_data_field_30.field_ft_30, exp_channel_data_field_31.field_id_31, exp_channel_data_field_31.field_ft_31, exp_channel_data_field_32.field_id_32, exp_channel_data_field_32.field_ft_32, exp_channel_data_field_33.field_id_33, exp_channel_data_field_33.field_ft_33, exp_channel_data_field_34.field_id_34, exp_channel_data_field_34.field_ft_34, exp_channel_data_field_35.field_id_35, exp_channel_data_field_35.field_ft_35, exp_channel_data_field_36.field_id_36, exp_channel_data_field_36.field_ft_36, exp_channel_data_field_37.field_id_37, exp_channel_data_field_37.field_ft_37, exp_channel_data_field_38.field_id_38, exp_channel_data_field_38.field_ft_38, exp_channel_data_field_39.field_id_39, exp_channel_data_field_39.field_ft_39, exp_channel_data_field_40.field_id_40, exp_channel_data_field_40.field_ft_40, exp_channel_data_field_41.field_id_41, exp_channel_data_field_41.field_ft_41, exp_channel_data_field_42.field_id_42, exp_channel_data_field_42.field_ft_42, exp_channel_data_field_43.field_id_43, exp_channel_data_field_43.field_ft_43, exp_channel_data_field_44.field_id_44, exp_channel_data_field_44.field_ft_44, exp_channel_data_field_45.field_id_45, exp_channel_data_field_45.field_ft_45, exp_channel_data_field_46.field_id_46, exp_channel_data_field_46.field_ft_46, exp_channel_data_field_47.field_id_47, exp_channel_data_field_47.field_ft_47, exp_channel_data_field_48.field_id_48, exp_channel_data_field_48.field_ft_48, exp_channel_data_field_49.field_id_49, exp_channel_data_field_49.field_ft_49, exp_channel_data_field_50.field_id_50, exp_channel_data_field_50.field_ft_50, exp_channel_data_field_51.field_id_51, exp_channel_data_field_51.field_ft_51, exp_channel_data_field_52.field_id_52, exp_channel_data_field_52.field_ft_52, exp_channel_data_field_53.field_id_53, exp_channel_data_field_53.field_ft_53, exp_channel_data_field_54.field_id_54, exp_channel_data_field_54.field_ft_54, exp_channel_data_field_55.field_id_55, exp_channel_data_field_55.field_ft_55, exp_channel_data_field_56.field_id_56, exp_channel_data_field_56.field_ft_56, exp_channel_data_field_57.field_id_57, exp_channel_data_field_57.field_ft_57, exp_channel_data_field_58.field_id_58, exp_channel_data_field_58.field_ft_58 FROM exp_channel_titles AS t LEFT JOIN exp_channels AS w ON t.channel_id = w.channel_id LEFT JOIN exp_channel_data AS wd ON t.entry_id = wd.entry_id LEFT JOIN exp_members AS m ON m.member_id = t.author_id LEFT JOIN exp_member_data AS md ON md.member_id = m.member_id LEFT JOIN exp_member_data_field_1 ON m.member_id = exp_member_data_field_1.member_id LEFT JOIN exp_member_data_field_2 ON m.member_id = exp_member_data_field_2.member_id LEFT JOIN exp_member_data_field_3 ON m.member_id = exp_member_data_field_3.member_id LEFT JOIN exp_member_data_field_4 ON m.member_id = exp_member_data_field_4.member_id LEFT JOIN exp_member_data_field_5 ON m.member_id = exp_member_data_field_5.member_id LEFT JOIN exp_member_data_field_6 ON m.member_id = exp_member_data_field_6.member_id LEFT JOIN exp_member_data_field_8