Issues/625@v3

Port from `v2`