Fixed rebase issue and address the comments.