Fixing issues pointed by the review.
Merge branch '40775047' into develop