Resolve "Unify guards for uggrid"

Merged Hanchuan Wu requested to merge cleanup/unify-guards-for-uggrid into master
Edited by Timo Koch

Merge request reports