Merging branch b2 to trunk