merge #3379 to 2.5