Infrastructure for overlay.
Merge branch 'master' into overlay