Merge branch 'jc/shared' into next