3.4 merge

This is the 3.4 changes since 3.3.3 release