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