Merged with newest patch1 changes