[devel] improved ODR handling