Nkukard Wiaflos Admin Fix3

Merged Nigel Kukard requested to merge nkukard/wiaflos:nkukard-wiaflos-admin-fix3 into master

Merge request reports