Merge branch '1620_file_hightlighting_icase'