Merge 3.3/develop into 3.4/develop

Updates the 3.4/develop branch with bug(and build) fixes from 3.3/develop.