Gh215 - add collection view extension + orderIndex in descriptor