openpdroid backport 1