for release r2
merged with master