[WIP] Feature/issue bundle