enable copy on access feature
Merge branch 'copy-on-access2' into dev
minor style changes