Hotspot changes again...
Not it builds again after merge