Addressing JIRA USERGRID-113, ICLA - Malaka Mahanama