Also seems like a behavior change, does it need any test?