Merge branch 'mv/parseopt-ls-files'