Manual merge of Bas' and Bram's changes for HBA fix

Merge request reports

Loading