Make some changes after review.
Merge
Merge