
Possibly fixes #822 Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> (cherry picked from commit 15d999229fcce865001d5fa77d0163e6e80e38db)
Possibly fixes #822 Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> (cherry picked from commit 15d999229fcce865001d5fa77d0163e6e80e38db)