This PR is not merged yet.

> Should i do it in this PR?

yes.  I think, so.