Split shutdown hang fix into own patch