Task #9489
Fixed merge issue