Code

Merge branch 'tr/userdiff-c-returns-pointer' into maint