Merge commit '8700c95adb03' into timers/nohz