new starter for master-2.5 #3446