All drivers have been updated with capabilities according to the latest best practices, this should not break anything, but if it does, please report it.
The Generic Switch/Plug and Switch/Light are now setting the capabilites correctly for Alexa, please try them and tell me of other drivers where this may be broken if you find any.
This exists as a hidden feature in the Generic Switch/Plug and Generic Switch/Light drivers now. I did add a try-catch statement, just in case.