Merge branch '2464_find_file_disabled_content_error' into 4.7.5-stable