master-2.5 merge #3479
master-2.5 merge #3479
master-2.5 merge #3479
master-2.5 merge #3479