Merge in ubstream changes; including selectors.