Merge branch 'upstream-1.8'

latest commit 8cc57ce979
@dieghen89 authored