Merge pull request #3737 from jlsherrill/cv-rework-merge

Merging master to cv-rework
initial cv publishing work