merged upstream using new collection
updated all apps to use the new collection format, also fixed found errors in CMS app to use th enew correct methods for PAPI