add masking to datalinks and empty trash
Merge branch 'master' into data-svc-caching