Merge "Support static address configuration" into rvc-dev