Merge remote-tracking branch 'atagar/ticket_6445'