Merge branch 'work/issue387' into work/1.7.0.2