base code for things that can corrupt
Merge remote-tracking branch 'origin/master'