xmp bugfix for controller port
Merge remote-tracking branch 'origin/devel-0.6' into devel-0.6