v8.0.00 Final Commit 2

Fixed issue with update from v7.1.02