[Bro-Dev] [JIRA] (BIT-1362) topic/dnthayer/fixes-for-2.4