Merge branch 'refcount-types' into 'master'