Merging  user.core-4.2.0-patch0009, Fixing https://wso2.org/jira/browse/CARBON-14859