Merge branch 'hotfix/initial'

* hotfix/initial:
  move variable initial place
Chang function name
Merge branch 'hotfix/5.0.1' into develop

* hotfix/5.0.1:
  Chang function name