All files from 1.0.20 with small edits, no code changes