Merge branch 'pre-jam' into jam