Related to https://github.com/wso2/carbon4-kernel/pull/120