Merge "Revert "FORK: QC driver bug workaround"" into lmp-dev