[merge] loose ends from previous merge