bug1
Merge branch 'new_feature2' into new_feature