Added new smartswitches
Implemented issue #254299