[Tech Debt]: extracted bundle from core