Merge "Bug fix for building the hover target list"