Closes #11332 (cherry picked from commit 27d50805de131a28a6f587ad4a3627d9903938e4) Signed-off-by: luis <[email protected]>