Original Jira issue: https://fluidproject.atlassian.net/browse/C2LC-208
Original Jira issue: https://fluidproject.atlassian.net/browse/C2LC-208