Bug17155

part 1 of 2 for #17155