Closes #31438 Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
Closes #28731 Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com> Co-authored-by: andymunro <48995441+andymunro@users.noreply.github.com>