Closes #1470
Signed-off-by: Anu Engineer <aengineer@apache.org> Co-Authored-By: Doroszlai, Attila <6454655+adoroszlai@users.noreply.github.com>