SM-512 is a pretty big issue, but it does not have by itself any solution (see my comment in JIRA). However, SM-521 could be implemented to be able to easily tune thread pools and queue sizes to avoid deadlocks. Though it may require quite an amount of refactoring, i'm wondering if we should implement it for 3.0 ?
-- Cheers, Guillaume Nodet