Lps 49384

Brian, please keep all the finals in this pull, they are essential for thread safety.