Merge branch 'refcount-box' into 'master'