fixes #4709
merge for 2.5.5 #4709
#4709