Merge changes from topic 'fix-pdf-spec-deviations'