Merge "Restoring generating artifacts" into sc-v2-dev