Fireball update
Merge commit '55172bb63006a277e090b227b71831899b3a692d'