Merge branch '2753_broken_hotlist'