Feature/rebase feature