Merged changes from trunk