Merge branch 'ticket-5028'