Merge branch 'jc/test-3402'