#2398 for master-2.5