CR_CORE/SOCKET system lay out tasks correctly. This is a complete fix for bug 1247 You can also reference commit 7461c119 for tests to give correct functionality.