Fix console script entry point
Merge branch 'develop'