Oo 50562 by harsha

[ludmilaFialova]

Frontend Pull Request Description

cherry-picks from
#835 (comment)

Checklist

• My code follows the style guidelines of this project
• I have performed a self-review of my code
• I have updated change log
• I have been following Definition of done
• I have commented my code, particularly in hard-to-understand areas
• My changes generate no new lint warnings
• New and existing unit tests pass locally and on CI with my changes
• Any dependent changes have been merged and published in downstream modules