Merge branch 'rs/log-invert-grep-with-headers'