Correcting merge conflicts from generic-PDF branch