am e1efe23f: Merge "Fix unbundled branches"

* commit 'e1efe23ff718d25c5f3d5ef7914f05f8f739eee5':
  Fix unbundled branches