Merge branch 'jn/mailinfo-scissors'