Fixed CLI Windows compatibility
Merge remote-tracking branch 'origin/develop'