Azure AD Multi Tenancy issue in AWS Cognito

I am currently trying to implement AWS Cognito with Azure AD Multi-tenancy but seems like currently, AWS Cognito doesn't support this feature. Please see the article below.

https://www.thelambdablog.com/azure-ad-multi-tenancy-issue-in-aws-cognito/

Could you please advise me if AWS is fixing this issue soon or if there is any good alternative?

Thanks