Vanilla 0.7.7
Applying patch for v0.8 support to v0.7.7