Try to fix merge issues for Ticket0339
Merge branch 'Ticket0339'