Fixed merge with upstream