import 0.7.4 release
merging