Fast-forward to 8.0

Change-Id: I59ff2568c8cb85dda36b13ad04d327dfbce6098e