Merge "Temp skip /product folder during root-hash calculation." into tm-dev