[960987] Part 1: Rebased