added upstream merges