Nkukard Wiaflos Admin Fix1

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

Merge request reports