Initial merge of NSA320