Merge branch 'jk/userdiff-config-simplify' into next