v8.0.06 Final Commit