Merge branch 'ticket/100' into release-v1.6.0