6 Months Ago
merge from hasflag_replacement