manual merge of codeacross into landing