Patch 1 is about refactoring, without any effect on functionality.

-- 
Yao (é½å°§)