Merge "Non-normative quality improvements to CLPF." into nextgenv2