[WIP] Build V1.7