dropped unnecessary non-null check
Merge branch 'staabm-patch-2'

* staabm-patch-2:
  dropped unnecessary non-null check
Merge branch 'master' into develop

* master:
  dropped unnecessary non-null check