fix #I5AIPF fix #I5AD5N (cherry picked from commit e72fc4bf764a9bca988612213a205c9534ca3c6f)
(cherry picked from commit 660a50e8357f7dae94ab3cda8f42dda3bddf134b)