0.80-rc1
Merge remote-tracking branch 'gh/firefly'