I have to admit this was an easy solution, but also it preserves backward-compatibility mostly (except for those who used '-o' in the past, that's why the commit was marked 'BK').