Merge "Decrease build time" into sc-v2-dev