MDL-39341 bootstrap fix exclude with rename