One more tiny fix when context is not available
Merge branch 'master' into internal