Merge "Merges in threading branch as one squashed commit" into release-4-6