[WIP] Build V3.6