Merge Emily's data set agent template and packaging changes