Merge pull request #4037 from brvphoenix/hd-idle