Merge branch 'ag/userdiff-go-funcname'