Merge branch 'bs/userdiff-php' into next