[sr-dev] git:master:ba647bb1: Merge pull request #398 from grumvalski/cnxcc_deadlock_fix