GOCORE-1862 I am the sixth commit for this jira