v20201019.1080

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 #2231 from McGiverGim/fix_sonar_cliautocomplete Fix Sonar issues Cli and CliAutoComplete