Merge "Fix GONE transition from the hub" into main