Inital merges of upstream member code