[MERGED] ELIP-016: Redistribution Delay