Merge "Models junits are failing locally"