Merge in Firefly code