Merge branches 'fire-extinguish', 'polygonal' and 'region-refactor' into develop