Merge "Refactor initial support check to use SupportInfo" into main