port all fixes from 4ab2c57b to solve build issues

Merge request reports

Loading