#3510 for master-2.5