am edf45678: Merge "Fix broken volantis build"

* commit 'edf45678f133ce51d7aff43be68d9be3936ffca2':
  Fix broken volantis build