[936503] Rebased