Merge branch 'rs/pretty-safety'