Review and rebasing changes