Merge branch 'ticket/165' into develop