Fix dynamic scoping caching issue
Merge remote branch 'origin/patch-1'