Merge "Made root job de-duplication work without cache setup"