Bug 21694: Keep the context