[950189] Rebased