Merge pull request #2586 from castillofrancodamian/hd_idle