Merge branch 'jc/t2300-setup'