Merged changes for chicken4.7 to trunk