Merge commit '1af489205a3942630e6203237213e98ef53d4118' * commit '1af489205a3942630e6203237213e98ef53d4118': Fix driver stop check
Merge commit '1af489205a3942630e6203237213e98ef53d4118' * commit '1af489205a3942630e6203237213e98ef53d4118': Fix driver stop check