Apply all suggestions from review 5226

+review REVIEW-5226