GOCORE-1862 I am the fourth commit for this jira