Improving code accorditng to the review
Merge branch '41172789' into develop