Merge branch 'rs/notes-merge-no-toctou'