[1016578] Rebased