Merge "Cleanup hub disabled flow by consolidating logic" into main