Missed variables during refactor.
Merge branch 'develop'

* develop:
  Missed variables during refactor.