matras and bps_tree CR fixes