backport 6acbadf41833c8d5a78aabb06c6c7e0f4f4c019b