Merge CARBON-14505

Please merge the issue fix for https://wso2.org/jira/browse/CARBON-14505