Applied fixed from code review
Merge "Applied fixed from code review"