Merge remote-tracking branch 'remotes/origin/ticket_6' into ticket_8
Merge branch 'ticket_8' into ticket_9