Pull optimize-ptrace-threads into release branch