Merge to 5.0.1 (cherry picked from commit ce03a34318) original commit: 6c79f0d399
ce03a34318
6c79f0d399