Extracted from #7244 Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com> (cherry picked from commit 68c47a323879a794c9fc87903233fd418fe2edab)
Extracted from #7244 Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com> (cherry picked from commit 68c47a323879a794c9fc87903233fd418fe2edab)