WMB-37: apply relevant changes made in fenix codebase during September #15

Closed laszlo-apro-bishop closed 1 year ago