Ticket WLPROD-67 Completed