#5093 for master-2.5