Split from #4374

This PR helps to reduce dependencies and align versions, which would
help to move them to workspace dep