Merge branch 'butterfly-conference-misc'