fix stages
add final stage functional
Merge branch 'hotfix/fix_stages'

* hotfix/fix_stages:
  add final stage functional
  fix stages