Merge 3.3/develop to 3.4/develop

Update 3.4/develop with bug and build fixes from 3.3/develop.