[JIRA](ISSUE #FLEX-28291) Dev review request

[Mihai Chira]

If anyone has time to review this bug fix, it would be very helpful.

You can comment on github and let me know here.

Thanks.