Closes PR 13681 Please merge to v5.3.4 (cherry picked from commit d84494dd44)
d84494dd44
Closes PR13671. (cherry picked from commit aac22e1ce5)
aac22e1ce5