Merge "Fixing problems in spring loaded mode and adding shortcut to hotseat. (5144911, 5144663)"