fix #I5FTB4 fix #I5LDB4 fix #I5OBZ9 (cherry picked from commit b4a83d73a3cdba481691bf29f2f1f17a98d34a14)