Merge "Hotspot 2.0 framework - add implementation"