I made a patch for my HP ProBook 430 G6. Seems to be working normally, haven't tested extensively yet though. Here it is in case anyone is interested:
into device label EC0 code_regex BDC,\s+16 replace_matched begin DC0,8,DC1,8 end;
into device label EC0 code_regex BFC,\s+16 replace_matched...