Merge "Add complementary display  concept"