Yesterday
merge from fix_privaddfriend_vis