Merge branch 'feature/cli-reload-emoji' into 'develop'