Merge 1.3.4