Merge pull request #4706 from Razz4780/scope-wizard-lint