Added warning to configurator [ci skip]
Updated configurator warning [ci skip]
Fixed configurator warning [ci skip]
Merge branch 'master' into tags