[Indigo] Issue/heavy payload rebased indigo