Merge "Update whatlinkshere-hideimages to file inclusion"