Merge branch 'kn/userdiff-php'