Unified artifacts

first commit is part of another CL