context: merge from trunk