Better solution to avoid invalidating current conversation.
Implemented tests for WELD-1452 based on tests by Marko Luksa