Merge from trunk, configury not fixed yet.