Merge from hardcore_refresh