9760cb101d
Fixes #9772 (cherry picked from commit fd30c0adcdfc0efc0aae9e5401843439f2622070)
Fixes #9772 (cherry picked from commit fd30c0adcdfc0efc0aae9e5401843439f2622070)