Merge branch 'ticket/166' into develop