merge with 3.3.4 releasing repo