Merge branch 'work/v3-2-test' into v3-2-test