v20201017.1071

This is a nightly build off the tip of 'master'. It may be unstable and result in corrupted configurations or data loss. Use only for testing.

Merge pull request #2228 from McGiverGim/fix_sonar_gulpfile Fix some Sonar issue of gulpfile