Merge 3.4 into poc