#3090 for master-2.5