#5118 for master-2.5