Test for a basic scope leak with rename (as well as open).
Merge branch 'master' into cache_improvements