Merge "Stable branch for edgecloud"