Replace isSoftDeleting with issset(...->runSoftDelete)

Fixes #620
Merge branch 'dev'
Handle ardent validation better