Merge branch 'rs/diff-postimage-in-context'