Issue: SPR-14517 (cherry picked from commit d96a66a) (cherry picked from commit ff878ea)
d96a66a
ff878ea