fixes #5086
master-2.5 merge #5086
master-2.5 merge #5086
master-2.5 merge #5086
master-2.5 merge #5086
master-2.5 merge #5086
master-2.5 merge #5086
master-2.5 merge #5086
master-2.5 merge #5086
#5086