port MR 1202 to basop v2

Merge request reports

Loading