https://wso2.org/jira/browse/CARBON-14505
https://wso2.org/jira/browse/CARBON-14505
Merge pull request #2 from thiliniish/master

Merge CARBON-14505