Merge "Use custom defined DNS/HTTP port" into main