Updating 3.4_Release with commits made to master