Merged Firehose branch