Merge branch 'develop' into feature/improved-console-support
Use current working directory with -R option and no file given
Merge branch 'feature/improved-console-support' into develop