Merge branch 'hotfix/fixing-build'

* hotfix/fixing-build:
  Fixing build
Add test_after_commit as a development dependency
Merge branch 'develop' into test_after_commit

* develop: