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