Merged in trunk