[899753] Rebased