did you add test cases for this change? Same applies for the changes below.