Follow-up of the following PR * https://github.com/trinodb/trino/pull/25751 * https://github.com/trinodb/trino/pull/26300 * https://github.com/trinodb/trino/pull/26136 * https://github.com/trinodb/trino/pull/25152 https://docs.google.com/document/d/1jEF4IkWu-2Gzk5ii2Nb0exuEnAUeo98UbiM3i0xtgWQ/edit?tab=t.0#heading=h.dglxb51zw9m2
