am c9ed2f47: (-s ours) Allow additional interface flags. Do not merge

* commit 'c9ed2f4706fa46e41a6ebbcd9a529d75c1ac84c5':
  Allow additional interface flags. Do not merge