Merge "Addressing issues from review"