updates resulting from branch merges.