[960987] Part 2: Rebased