update #90
(cherry picked from commit 5405bc9)