No, it is not necessary to do it in this PR.