Submitted attached patch (cherry picked from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb) to stable.
Submitted attached patch (cherry picked from commit 410d44c74cf9942 e3055d5b7d73953 fac8efbacb) to stable.