Merge branch 'poc_fence'