Merge branch 'zb/userdiff-fountain'