Merge branch 'ticket/164' into develop