leayout improvements
Merge branch 'master' into auto-export
caching