Merge commit '40c10bf4dfbaf2a48b3fe6d2fcc58843cefc01bc' * commit '40c10bf4dfbaf2a48b3fe6d2fcc58843cefc01bc': More work on issue #2030135: Device sluggish
Merge commit '40c10bf4dfbaf2a48b3fe6d2fcc58843cefc01bc' * commit '40c10bf4dfbaf2a48b3fe6d2fcc58843cefc01bc': More work on issue #2030135: Device sluggish