Merge branch 'improve-safety'