Sending enable/disable message to ui-switch destroys the saved msg.topic from previous messages, also the switch is switched off

A ui-switch node can be configured to use msg.topic as the topic to send on a state change.
If an enable/disable message is sent (with no topic) using msg.enabled true or false then the topic saved from a previous message setting the switch state is lost.
I don't think that an enable/disable message should have such side effects.

Edit: Also if the switch is On and is then disabled and enabled then the switch is set to Off. That should not happen.