Merge branch 'rs/diff-whole-function'