second merge of nucleus into test

second merge of nucleus into test