backport threading property changes
2 files changed