6 Months Ago
merge from hardcore_refresh