Add escaping
Final fix for file selection
Remove debug message
Non-functional change
Non-functional change
Merge branch 'master' into COGE-441