#3909 for master-2.5