update #94, #95
(cherry picked from commit 27cdffc)