numeric directive, soft delete and custom fields changs
Merge origin/master