Merge branch 'pdemanget-master' into 2.0.8