add deadlock detection limit to API implementations too
Merge branch '2.0-maint' into 2.1-maint