Merge branch 'jc/userdiff-pattern-hint'