Updating core to 3.4.0, adding master 340
Updating core to 3.4.0, adding master 340
Merge remote-tracking branch 'upstream/develop' into develop