Merge branches 'fire-extinguish' and 'polygonal' into develop