Ticket #7230 & #6768