Merge branch 'mz/oneway-merge-wo-u-no-lstat'