[899753] Part 2: rebased