Merge changes to branch
Merge from trunk
Merge test fixes from trunk