Merge branch 'doc-multiple-persistence-overlays' into 'master'