Merge "Reset & clean workspace repo for better hygiene"