merge with release 3.0