Fixing merge changes
Merge branch 'develop'

* develop:
  Fixing merge changes