Merge branch 'ticket-5066' into develop