PCA Project: Add all hunks missed due to faulty merge