Lock all dependencies
Merge branch 'master' into dev
Merge remote-tracking branch 'upstream/dev' into first_website