refine conditions
console
Merge branch 'master' into send-file