Refactor methods to consider organizaitonal_permission.deleted_at
Merge branch 'MH-646' into dev