Does this change need for this PR. I think this should be extracted to separated PR. What do you think?