Merge branch '3423-fix-for-1.10.x' into '1.10.x'

Cherry-pick commits from !4527 (merged) for !4802 (merged) to work over 1.10.x