Merge "Pulling secondary user artifacts from tests" into main