Merge "Skip domain approval logic if host is invalid" into sc-dev