Merge branch 'hotfix-003' into develop
Refactored as standalone package
Merge branch 'develop'