Adds more HPQC logging
Merge branch '2.1M2' into qa