[IMP]: some change for related to rebase.