Merge branch 'hotfix/fab-complete' into develop
NODE_PATH removed from env file
Merge branch 'develop'