PR: 3165 Submitted by: Daniel Richard G. (cherry picked from commit 2df9ec01) (cherry picked from commit 0de70011)