also wanted to check if this kind of change should be backported