Merge "Hotspot 2.0 framework - Update implementation"