[966895] Rebased