Cherry-pick MR !422 to 2017-patches branch
'add missing protection'
See merge request !422 (merged)
(cherry picked from commit 33fe1f3c)
2605012c 'add missing protection'
'add missing protection'
See merge request !422 (merged)
(cherry picked from commit 33fe1f3c)
2605012c 'add missing protection'