[merge] loose ends from the previous merge