Merge branch 'jc/boundary'