updates related to the previous merge with upstream/master.