Update to 2.0.7
Merge remote-tracking branch 'upstream/master' into add-phi-convict-configuration