more context

(cherry picked from commit 80df892)