Merge branch 'er/stop-recommending-parsecvs' into maint