Fix for failing TS tests after upgrading to v3. (#3845) 96e1b34 update lodash.merge dependency in client (#3836) 222c603 v3.1.0...v3.1.2