Show links and categories in Equipment views.
Merge remote-tracking branch 'origin/master'