Merge "Remove "active" attribute from the allowed_address_pairs"