Re #9034 fixing files corrupted by merge
Revert "Merge branch 'PredictorAPI' into 'master'"
This reverts merge request !20
Re #8955 refactoring
Re #8836. Added XML protocol building / parsing.