[1030889] Rebased