Fix the use of traitsUsed
Merge branch 'feature/softdel-parents-traits-fix' into hhj