master-2.5 merge #3479
#5309