Related to issue PROJ-5 on JIRA