Change long to short in the config
Merge branch 'develop'