huge bug fix in elaboration candidate plus test
Merge remote-tracking branch 'origin/master'