andre 00e4766780 merge thurdata & 3.4.0 4 lat temu
..
assets 00e4766780 merge thurdata & 3.4.0 4 lat temu