gdev: bugfix
Merge remote-tracking branch 'origin/gdev-axe'