Merge "Fixing leak in model tests" into sc-v2-dev