Candidate redux74

see #3961
and
#6678

superseeds the latter