Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416' * commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416': Avoid starting multiple threads in ShutdownThread
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416' * commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416': Avoid starting multiple threads in ShutdownThread