Merged changes from chc4