source: branches/client-1.5/