Merge branch '3720_mcview_search_error_messages'