merge trunk head (37902)