Merge branch 'as/userdiff-pascal'