40 Days Ago
merge from hasflag_replacement