[Bro-Dev] [JIRA] (BIT-1069) merge topic/bernhard/hexstr