Merge branch 'cleanup/unify-ug-guard-lecture-v3.4' into 'master'

[lecture] Unify guards for UG grid

See merge request !154

(cherry picked from commit 76b48e27)

d4699f30 [lecture] Unify guards for UG grid