Merge branch 'ticket/167' into develop