[WIP] Build V3.4