Final changes for patch
Minimize diffs
Patch initial version