GOCORE-1862 I am the third pull request title

I am the third pull request description