[Bug 47976] 4.17->4.18 regression