Update tag
Update package-lock
Update package.lock
Merge branch 'master' into release-2.4
Merge with master. Version set to 2.4.1.
Version set to 2.4.0