Merge branch 'release/Release3' into production
fog 1.12?
lock file
Merge branch 'production'