Revert "Revert "Addressing JIRA USERGRID-113, ICLA - Malaka Mahanama""

This reverts commit ba4ba33d0258a0b74f7e563e9323876dcf7875e5.