offer bij1 contributions (feel free to cherry-pick)

Merge request reports

Loading