Try to fix merge issues for Ticket0339