Merge branch 'list_safety'