Merge branch 'poc_fencing'