Merging our custom changes to C*