Merge branch 'pr/1307' into v1.8.6