Merge "Don't require in-place MAC address update"