Manually merged metseg repo.