merge in updates from whitecore