Add fire indicator.
Merge master into add-fire-indicator.