Need review for this PR

[zhifanl]

Can anyone help me review this PR: #2104

[yonib05]

Hey @zhifanl,

Flagging this to the team; we will take a look.

[JackYPCOnline]

Reviewed + replied this PR, awaiting for @zhifanl reply. Close this discussion, we could communicate in the PR.