stub removed
Merge branch 'hotfix/stub_remove'

* hotfix/stub_remove:
  stub removed