Improved fix for https://wso2.org/jira/browse/IDNCLOUD-324
Improved fix for https://wso2.org/jira/browse/IDNCLOUD-324

wso2-extensions/identity-cloud,wso2-extensions/identity-cloud,wso2-extensions/identity-cloud