Merge "Support static address configuration"