fix #1634
Merge branch 'jygaulier-3.8-fix1674' into 3.8