(LOCAL) merged from trunk