Merge of stack & master.