Merge "Avoid using cascadingDeletes()/cleanupTriggers()"