GOCORE-1862 I am the third commit for this jira