[V1S6 US40] Import custom attribute types
[V1S6 US40] Import of custom attribute types + Unit tests