Issue #3311833 by teodorakis, zaporylie: Make "FullName" mapping conditional so we don't end up we duplicate names for private customers