4 Hours Ago
merge from safezonewarning_fix