Resolve conflicts - wi module cherry-pick vs release/0.18

Merge request reports

Loading