Merge "Fix unbundled branches"