Merge "ANS: Switch from PDFs to CDFs." into nextgenv2