COMP: remoed export macros
Merge branch 'bug-18055-FiberfoxDashboard'