Merge branch '2462_find_content_enable_by_default'