Merging changes introduced in https://wso2.org/jira/browse/CARBON-14718