backport_tree_paginator_1.5.x