Updated user_address resource after cherry picking from other branch