re #8683 Fixing project dependencies problems
Draft Predictor
re #8598 @2h
re #8597 Code maintenance - comments, namespace changes
Rename