Add the identifier to the list output
Merge branch 'master' into virtual_collection_rework