Merge to 5.0.1 (cherry picked from commit f602d11a7f) original commit: 77a0796a6c
f602d11a7f
77a0796a6c