#3959 for master-2.5