Ticket GCAP 11

Ticket GCAP 11