Resolve "Avoidance of undefined-variable use in OBS" ('branch_4.2')

Merged Simon Mueller requested to merge 254-avoidance-of-undefined-variable-use-in-obs-2 into branch_4.2

Closes #254 (closed)

Merge request reports