diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 156c98404d..40c86e26a9 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -38,9 +38,9 @@ highway|cycleway;37;
 landuse|farm;38;
 amenity|place_of_worship;39;
 highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40;
-deprecated|deprecated;41;x
+addr:interpolation|odd;41;
 highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;
-deprecated|deprecated;43;x
+addr:interpolation|even;43;
 highway|motorway_link;44;
 waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;
 highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46;
@@ -538,7 +538,7 @@ deprecated|deprecated;537;x
 deprecated|deprecated;538;x
 railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;
 barrier|cycle_barrier;540;
-deprecated|deprecated;541;x
+addr:interpolation;[addr:interpolation];;addr:housenumber;name;541;
 amenity|speed_trap;542;highway|speed_camera
 area:highway|track;543;
 area:highway|primary;544;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index caa4633908..d5c2a918a7 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -1,5 +1,51 @@
 [[Types]]
 
+  [type.addr_interpolation]
+    en = Address/Block
+    ar = العنوان / البلوك
+    be = Адрас/Блок
+    bg = Адрес/Блок
+    ca = Adreça/Bloc
+    cs = Adresa/blok
+    da = Adresse/blok
+    de = Adresse/Block
+    el = Διεύθυνση/Μπλοκ
+    es = Dirección/Bloque
+    et = Aadress/plokk
+    eu = Helbidea/Blokea
+    fa = آدرس/بلاک
+    fi = Osoite/lohko
+    fr = Adresse/Bloc
+    he = כתובת/חסימה
+    hu = Cím/blokk
+    id = Alamat/Blokir
+    it = Indirizzo/Blocco
+    ja = アドレス/ブロック
+    ko = 주소/블록
+    mr = पत्ता/ब्लॉक
+    nb = Adresse/blokk
+    nl = Adres/blok
+    pl = Adres/Blok
+    pt = Endereço/Bloco
+    pt-BR = Endereço/Bloco
+    ro = Adresă/Bloc
+    ru = Адрес/Блок
+    sk = Adresa/blok
+    sv = Adress/Block
+    sw = Anwani/Zuia
+    th = ที่อยู่/บล็อค
+    tr = Adres/Blok
+    uk = Адреса/блок
+    vi = Địa chỉ/Khối
+    zh-Hans = 地址/区块
+    zh-Hant = 地址/區塊
+
+  [type.addr_interpolation.even]
+    ref = type.addr_interpolation
+
+  [type.addr_interpolation.odd]
+    ref = type.addr_interpolation
+
   [type.aerialway]
     en = Aerialway
     de = Seilbahn
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index f795fb60ef..b0eabc373a 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1638,6 +1638,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     // {"railway", "subway"},
     // {"traffic_calming", "bump"},
     // {"traffic_calming", "hump"},
+    {"addr:interpolation", "even"},
+    {"addr:interpolation", "odd"},
     {"aerialway", "cable_car"},
     {"aerialway", "chair_lift"},
     {"aerialway", "drag_lift"},
@@ -2236,6 +2238,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     //
     // Manually constructed type, not parsed from osm.
     // {{"building", "address"}, {{"addr:housenumber", "any_value"}, {"addr:street", "any_value"}}},
+    {{"addr:interpolation"}, {{"addr:interpolation", "all"}}},
     {{"aeroway", "aerodrome", "international"}, {{"aeroway", "aerodrome"}, {"aerodrome", "international"}}},
     {{"amenity", "grave_yard", "christian"}, {{"amenity", "grave_yard"}, {"religion", "christian"}}},
     {{"amenity", "parking", "fee"}, {{"amenity", "parking"}, {"fee", "any_value"}}},
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index b86dc48598..22f21cf647 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -113,6 +113,11 @@ namespace
     if ((geomType == GeomType::Point || geomType == GeomType::Undefined) && type == region)
       return scales::GetUpperWorldScale();
 
+    ftype::TruncValue(type, 1);
+    static uint32_t const addr = cl.GetTypeByPath({"addr:interpolation"});
+    if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == addr)
+      return scales::GetUpperScale();
+
     return -1;
   }