Merge all of PAPI changes