Design for deleted resources in security
Merge branch 'cardoso'