Merge code updates from Base