#3214 for master-2.5