Developped new interface for content data and updated all usages to use this interface (2 each iterators, 1 over contents and 1 over instances)
Merge remote-tracking branch 'origin/content_data_new_3' into content_data_new_3