update from origin/0.7.4